From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 13 Jul 2022 12:40:53 +0000 (+0200)
Subject: * lisp/vc/vc-bzr.el (vc-bzr-program): Support breezy.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1886^2~961
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=806666982602de80e889c2e59c347eb9e0aabd77;p=emacs.git

* lisp/vc/vc-bzr.el (vc-bzr-program): Support breezy.
---

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index ee394a93af4..072bd72b441 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -64,9 +64,13 @@
   :version "22.2"
   :group 'vc)
 
-(defcustom vc-bzr-program "bzr"
+(defcustom vc-bzr-program
+  (or (executable-find "bzr")
+      (executable-find "brz")
+      "bzr")
   "Name of the bzr command (excluding any arguments)."
-  :type 'string)
+  :type 'string
+  :version "29.1")
 
 (defcustom vc-bzr-diff-switches nil
   "String or list of strings specifying switches for bzr diff under VC.